Make autoscrolling work at the bottom of the screen.

2005-05-26  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkcombobox.c (gtk_combo_box_list_auto_scroll): Make
	autoscrolling work at the bottom of the screen.

diff --git a/ChangeLog b/ChangeLog
index c7e65f25b3a1b2907a03f75c150d8d7727e0bf97..1018ae55135beff86fe62416d96ea9ef7b9732d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-26  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_list_auto_scroll): Make 
+       autoscrolling work at the bottom of the screen.
+
 2005-05-26  Maciej Katafiasz  <email@mathrick.org>
 
        * docs/reference/gtk/tmpl/gtkentry.sgml:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c7e65f25b3a1b2907a03f75c150d8d7727e0bf97..1018ae55135beff86fe62416d96ea9ef7b9732d0 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-05-26  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_list_auto_scroll): Make 
+       autoscrolling work at the bottom of the screen.
+
 2005-05-26  Maciej Katafiasz  <email@mathrick.org>
 
        * docs/reference/gtk/tmpl/gtkentry.sgml:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c7e65f25b3a1b2907a03f75c150d8d7727e0bf97..1018ae55135beff86fe62416d96ea9ef7b9732d0 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-05-26  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_list_auto_scroll): Make 
+       autoscrolling work at the bottom of the screen.
+
 2005-05-26  Maciej Katafiasz  <email@mathrick.org>
 
        * docs/reference/gtk/tmpl/gtkentry.sgml:

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index f03ebb7ace5aed4b966c127e23155a90e8610a5a..e88dc485d121afb103f558007dede1a83e3a01fa 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -3621,10 +3621,10 @@ gtk_combo_box_list_auto_scroll (GtkComboBox *combo_box,
          value = adj->value - (tree_view->allocation.y - y + 1);
          gtk_adjustment_set_value (adj, CLAMP (value, adj->lower, adj->upper - adj->page_size));
        }
-      else if (y >= tree_view->allocation.y + tree_view->allocation.height &&
+      else if (y >= tree_view->allocation.height &&
               adj->upper - adj->page_size > adj->value)
        {
-         value = adj->value + (y - tree_view->allocation.y - tree_view->allocation.height + 1);
+         value = adj->value + (y - tree_view->allocation.height + 1);
          gtk_adjustment_set_value (adj, CLAMP (value, 0.0, adj->upper - adj->page_size));
        }
     }